*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index e260f9144528081ed86aec46bde856a7a2bdfca0..d118a770e177349b06e107578dd73a0006d11c19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c: Don't forget to destroy the row separator
+       function user data when the combo box is destroyed.
+
 2004-07-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.h: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e260f9144528081ed86aec46bde856a7a2bdfca0..d118a770e177349b06e107578dd73a0006d11c19 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-07-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c: Don't forget to destroy the row separator
+       function user data when the combo box is destroyed.
+
 2004-07-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.h: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e260f9144528081ed86aec46bde856a7a2bdfca0..d118a770e177349b06e107578dd73a0006d11c19 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-07-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c: Don't forget to destroy the row separator
+       function user data when the combo box is destroyed.
+
 2004-07-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.h: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e260f9144528081ed86aec46bde856a7a2bdfca0..d118a770e177349b06e107578dd73a0006d11c19 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-07-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c: Don't forget to destroy the row separator
+       function user data when the combo box is destroyed.
+
 2004-07-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.h: 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index bfae4b0e7350e476d3c8964d32c2886ecc7899be..1b0dc441db53106ae64d3b0d3c65e9705fb054c5 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4120,6 +4120,13 @@ gtk_combo_box_destroy (GtkObject *object)
 
   gtk_combo_box_popdown (combo_box);
 
+  if (combo_box->priv->row_separator_destroy)
+    (* combo_box->priv->row_separator_destroy) (combo_box->priv->row_separator_data);
+
+  combo_box->priv->row_separator_func = NULL;
+  combo_box->priv->row_separator_data = NULL;
+  combo_box->priv->row_separator_destroy = NULL;
+
   combo_box->priv->destroying = 1;
 
   GTK_OBJECT_CLASS (parent_class)->destroy (object);